[SOLARIS] Use GNU grep on Solaris.

Signed-off-by: John Levon <john.levon@sun.com>

diff --git a/Config.mk b/Config.mk
index 5154d4b1353a6e37e28841a80b3d1698b70268f1..0c72e24a95c00aab04d33762edd2afeed32902ea 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -24,7 +24,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
 EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 endif
 
-test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
+test-gcc-flag = $(shell $(1) -v --help 2>&1 | $(GREP) -q " $(2) " && echo $(2))
 
 ifneq ($(debug),y)
 CFLAGS += -DNDEBUG

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index ae61ea0095f46c240217005c8e7ee654aa328fdd..9e64c5a5eb3c912a8c83a5bd7dadcd70ae58b22e 100644 (file)
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -22,7 +22,7 @@ endif
 
 # Expand Linux series to Linux version
 LINUX_SERIES   ?= 2.6
-LINUX_VER      ?= $(shell grep "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//')
+LINUX_VER      ?= $(shell $(GREP) "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//')
 
 # Setup Linux search path
 LINUX_SRC_PATH ?= .:..
@@ -125,7 +125,7 @@ config-update-pae:
 ifeq ($(XEN_TARGET_X86_PAE),y)
        sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
 else
-       grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
+       $(GREP) '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
 endif
 
 # never delete any intermediate files.

diff --git a/config/Linux.mk b/config/Linux.mk
index 0e00d5520e37bfab294cf1e75057b5250d4486a1..fc434b2a3562c359ed225f08f755713e4389d9cd 100644 (file)
--- a/config/Linux.mk
+++ b/config/Linux.mk
@@ -11,6 +11,8 @@ STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
+GREP       = grep
+
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755
 INSTALL_DATA = $(INSTALL) -m0644

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 9acfc03c5da4366f4347a5f88306a3edd9206b73..0386ca2cbdffbff7d60b0f1c9c852863f3f3c968 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -11,6 +11,8 @@ STRIP      = $(CROSS_COMPILE)gstrip
 OBJCOPY    = $(CROSS_COMPILE)gobjcopy
 OBJDUMP    = $(CROSS_COMPILE)gobjdump
 
+GREP       = ggrep
+
 INSTALL      = ginstall
 INSTALL_DIR  = $(INSTALL) -d -m0755
 INSTALL_DATA = $(INSTALL) -m0644